You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by to...@apache.org on 2015/06/10 00:56:41 UTC

[6/9] incubator-usergrid git commit: added typical file location for properties files

added typical file location for properties files


Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/30a4d36b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/30a4d36b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/30a4d36b

Branch: refs/heads/two-dot-o-dev
Commit: 30a4d36b98c486cf2ca06057546d5e547196aced
Parents: 1ba2ce4
Author: Jeff West <jw...@apigee.com>
Authored: Fri Jun 5 18:14:47 2015 -0700
Committer: Jeff West <jw...@apigee.com>
Committed: Fri Jun 5 18:14:47 2015 -0700

----------------------------------------------------------------------
 stack/rest/src/main/resources/usergrid-rest-deploy-context.xml | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/30a4d36b/stack/rest/src/main/resources/usergrid-rest-deploy-context.xml
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/resources/usergrid-rest-deploy-context.xml b/stack/rest/src/main/resources/usergrid-rest-deploy-context.xml
index e9b7ccd..b7bf658 100644
--- a/stack/rest/src/main/resources/usergrid-rest-deploy-context.xml
+++ b/stack/rest/src/main/resources/usergrid-rest-deploy-context.xml
@@ -33,6 +33,7 @@
 		<property name="locations">
 			<list>
 				<value>classpath:/usergrid-default.properties</value>
+				<value>file:/usr/share/tomcat7/lib/usergrid-deployment.properties</value>
 			</list>
 		</property>
 	</bean>