Merge branch 'trunk' into branch-alerts-dev
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/0b406cbe Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/0b406cbe Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/0b406cbe Branch: refs/heads/trunk Commit: 0b406cbefdbfc8f53b25d203319c964fcf3f93c7 Parents: 84c16c5 42a07f9 Author: Nate Cole <nc...@hortonworks.com> Authored: Sun Sep 7 16:53:49 2014 -0400 Committer: Nate Cole <nc...@hortonworks.com> Committed: Sun Sep 7 16:53:49 2014 -0400 ---------------------------------------------------------------------- .../java/org/apache/ambari/server/orm/entities/ViewEntity.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ----------------------------------------------------------------------
