Updated Branches: refs/heads/javelin 13aef24ba -> 8f3789dab
fix build Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/8f3789da Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/8f3789da Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/8f3789da Branch: refs/heads/javelin Commit: 8f3789dab232de8a4634cb764b49e573d0d12bb0 Parents: 13aef24 Author: Edison Su <[email protected]> Authored: Fri Dec 28 17:24:49 2012 -0800 Committer: Edison Su <[email protected]> Committed: Fri Dec 28 17:24:49 2012 -0800 ---------------------------------------------------------------------- .../SolidfirePrimaryDataStoreProvider.java | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8f3789da/plugins/storage/volume/solidfire/src/org/apache/cloudstack/storage/datastore/provider/SolidfirePrimaryDataStoreProvider.java ---------------------------------------------------------------------- diff --git a/plugins/storage/volume/solidfire/src/org/apache/cloudstack/storage/datastore/provider/SolidfirePrimaryDataStoreProvider.java b/plugins/storage/volume/solidfire/src/org/apache/cloudstack/storage/datastore/provider/SolidfirePrimaryDataStoreProvider.java index b6c92a3..d84ac8e 100644 --- a/plugins/storage/volume/solidfire/src/org/apache/cloudstack/storage/datastore/provider/SolidfirePrimaryDataStoreProvider.java +++ b/plugins/storage/volume/solidfire/src/org/apache/cloudstack/storage/datastore/provider/SolidfirePrimaryDataStoreProvider.java @@ -38,13 +38,10 @@ public class SolidfirePrimaryDataStoreProvider extends DefaultPrimaryDataStore pds = DefaultPrimaryDataStore.createDataStore(dsv); SolidfirePrimaryDataStoreDriver driver = new SolidfirePrimaryDataStoreDriver(); pds.setDriver(driver); -<<<<<<< HEAD + DefaultPrimaryDataStoreLifeCycleImpl lifeCycle = new DefaultPrimaryDataStoreLifeCycleImpl(dataStoreDao); -======= - DefaultPrimaryDataStoreLifeCycleImpl lifeCycle = new DefaultPrimaryDataStoreLifeCycleImpl(super.dataStoreDao, pds); ->>>>>>> Getting things to compile pds.setLifeCycle(lifeCycle); return pds; }
