usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From snoopd...@apache.org
Subject [5/7] git commit: Fixed merge errors with the formatting
Date Fri, 18 Jul 2014 13:15:38 GMT
Fixed merge errors with the formatting


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

Branch: refs/heads/cloud-formation-scripts
Commit: 65ff6815d5faf4c8c5171738522b4c972d04393f
Parents: 5ec28c3
Author: grey <greyes@apigee.com>
Authored: Mon Jul 14 15:12:03 2014 -0700
Committer: grey <greyes@apigee.com>
Committed: Mon Jul 14 15:12:03 2014 -0700

----------------------------------------------------------------------
 stack/awscluster/ugcluster-cf.json | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/65ff6815/stack/awscluster/ugcluster-cf.json
----------------------------------------------------------------------
diff --git a/stack/awscluster/ugcluster-cf.json b/stack/awscluster/ugcluster-cf.json
index bc8093e..4ed8ad6 100644
--- a/stack/awscluster/ugcluster-cf.json
+++ b/stack/awscluster/ugcluster-cf.json
@@ -187,6 +187,7 @@
                            "Effect":"Allow",
                            "Action":"*",
                            "Resource":"*"
+
                         }
                      ]
                   }


Mime
View raw message