Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/204aab12
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/204aab12
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/204aab12
Branch: refs/heads/master
Commit: 204aab12f36ea14f5c15a7f376140cbcbd18d25a
Parents: 5f6d80a b5d57f8
Author: Suresh Marru <smarru@apache.org>
Authored: Tue Feb 25 16:22:23 2014 -0500
Committer: Suresh Marru <smarru@apache.org>
Committed: Tue Feb 25 16:22:23 2014 -0500
----------------------------------------------------------------------
.../registry/jpa/impl/ExperimentRegistry.java | 101 ++++++++++++++++++-
.../registry/jpa/impl/RegistryImpl.java | 9 +-
.../src/main/resources/registry-derby.sql | 1 +
.../airavata/registry/cpi/utils/Constants.java | 9 +-
4 files changed, 117 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
|