Permalink
Commits on Apr 25, 2012
  1. Changes in hard disks.

    Jaume Devesa committed Apr 25, 2012
  2. merge conflicst resolved

    zmalik committed Apr 25, 2012
  3. Merge branch 'fix3260'

    Jaume Devesa committed Apr 25, 2012
  4. ABICLOUDPREMIUM-3260. Fix bugs

    Jaume Devesa committed Apr 25, 2012
  5. merge conflicts resolved

    zmalik committed Apr 25, 2012
  6. conflicts merge resolved

    zmalik committed Apr 25, 2012
Commits on Apr 24, 2012
  1. Merge branch '3260'

    Jaume Devesa committed Apr 24, 2012
  2. ABICLOUDPREMIUM-3260. Fixed.

    Attach two times the same disk to the virtual machine should raise a
    Conflict Exception.
    Jaume Devesa committed Apr 24, 2012
  3. Merge branch '2762'

    Jaume Devesa committed Apr 24, 2012
  4. Merge branch 'master' of github.com:abiquo/abiquo

    Conflicts:
    	api/src/main/resources/springresources/security-beans.xml
    Jaume Devesa committed Apr 24, 2012
  5. ABICLOUDPREMIUM-2762. Fixed.

    Jaume Devesa committed Apr 24, 2012
  6. Merge branch '3428' into stable

    Jaume Devesa committed Apr 24, 2012
Commits on Apr 20, 2012
  1. Merge branch 'stable'

    Conflicts:
    	aimstub/pom.xml
    	am/pom.xml
    	api/pom.xml
    	database/pom.xml
    	indexgenerator/pom.xml
    	model/pom.xml
    	nodecollector/pom.xml
    	ovfmanager/pom.xml
    	pom.xml
    	server/pom.xml
    	system-properties/pom.xml
    	task-service/pom.xml
    	tracer/pom.xml
    	vsm/pom.xml
    nacx committed Apr 20, 2012
  2. since annotation removed

    zmalik committed Apr 20, 2012
Commits on Apr 19, 2012
  1. Merge branch 'ABICLOUDPREMIUM-3724' into 2.0-HF1-prev

    The API was relaying on the links to persiste relations. So the server
    not sending them. Moved to the library to solve this.
    Serafin Sedano committed Apr 19, 2012
  2. Merge branch 'ABICLOUDPREMIUM-3724' into stable

    ABICLOUDPREMIUM-3724 The API was relaying on the links to persist
    relations. The server was not sending them. Took advantadge on the
    jclouds library to solve it.
    Serafin Sedano committed Apr 19, 2012
  3. Merge branch 'ABICLOUDPREMIUM-3724' The API was relaying on the links to

    persist relations. The server was omitting most of them. Migrated the
    code to jclouds to solve it.
    Serafin Sedano committed Apr 19, 2012
  4. ABICLOUDPREMIUM-3724 The API was relaying on the links to persist

    relations. The server was not sending them. Took advantadge on the
    jclouds library to solve it.
    Serafin Sedano committed Apr 19, 2012