You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@esme.apache.org by le...@apache.org on 2011/09/13 00:42:41 UTC
svn commit: r1169967 - in /esme/branches/lift-2.4: ./
server/src/main/resources/props/compass.filesystem.cfg.xml
Author: lester
Date: Mon Sep 12 22:42:41 2011
New Revision: 1169967
URL: http://svn.apache.org/viewvc?rev=1169967&view=rev
Log:
Merged latest changes from trunk.
Modified:
esme/branches/lift-2.4/ (props changed)
esme/branches/lift-2.4/server/src/main/resources/props/compass.filesystem.cfg.xml (props changed)
Propchange: esme/branches/lift-2.4/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 12 22:42:41 2011
@@ -1,3 +1,3 @@
/esme/branches/lift-2.2/trunk:1051384-1055974
-/esme/trunk:1150805-1166873
+/esme/trunk:1150805-1167068
/incubator/esme/branches/lift-2.2/trunk:1043371-1051383
Propchange: esme/branches/lift-2.4/server/src/main/resources/props/compass.filesystem.cfg.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 12 22:42:41 2011
@@ -1,6 +1,6 @@
/esme/branches/esme-328_comet_timeline_rewrite/src/main/resources/props/compass.filesystem.cfg.xml:1088273-1090390
/esme/branches/lift-2.2/trunk/server/src/main/resources/props/compass.filesystem.cfg.xml:1051384-1055974
-/esme/trunk/server/src/main/resources/props/compass.filesystem.cfg.xml:1150805-1166873
+/esme/trunk/server/src/main/resources/props/compass.filesystem.cfg.xml:1150805-1167068
/incubator/esme/branches/lift-2.2/trunk/server/src/main/resources/props/compass.filesystem.cfg.xml:1043371-1051383
/incubator/esme/branches/metadata/src/main/resources/props/compass.filesystem.cfg.xml:966215-979767
/incubator/esme/branches/tagandconversationfollow/src/main/resources/props/compass.filesystem.cfg.xml:966215-1006324