Merge pull request #175 from aegif/topic_2.3.6

Merge 2.3.6 re-cmommit
aegif · Dec 10, 2015 · 3868fc7 · 3868fc7
2 parents 372cd88 + 430ab92
commit 3868fc7
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/setup/installer/tomcat/app-server-core-repositories.yml b/setup/installer/tomcat/app-server-core-repositories.yml
@@ -6,7 +6,7 @@ default:
   thinClientUri: http://localhost:8080/ui/
   vendor: aegif
   product.name: NemakiWare
-  product.version: 2.3.4
+  product.version: 2.3.6
   namespace: http://www.aegif.jp/NemakiWare/
 super.users: canopy
 repositories:

diff --git a/solr/solr/conf/repositories.yml b/solr/solr/conf/repositories.yml
@@ -3,9 +3,6 @@ settings:
    canopy: !jp.aegif.nemaki.util.yaml.RepositorySetting
       password: solr
       user: solr
-   aegif: !jp.aegif.nemaki.util.yaml.RepositorySetting
-      password: solr
-      user: solr
    bedroom: !jp.aegif.nemaki.util.yaml.RepositorySetting
       password: solr
       user: solr