Revision 03914330 - Fix merge of master branch - OpenNebula - OpenNebula Development pages

« Previous | Next »

Revision 03914330

ID	03914330a41d9bdbb06e83937ebc13802dea9f41
Parent	7686ca93
Child	e332df6d

Added by Ruben S. Montero over 7 years ago

Fix merge of master branch

Files

added
modified
copied
renamed
deleted

View differences

SConstruct (diff)
include
- Client.h
- GroupPool.h (diff)
- PoolSQL.h (diff)
- RequestManagerProxy.h (diff)
- UserPool.h (diff)
- ZonePool.h (diff)
src
- client
  - Client.cc
  - SConstruct
- group
  - GroupPool.cc (diff)
- nebula
  - SConstruct (diff)
- rm
  - RequestManagerProxy.cc (diff)
- scheduler
  - SConstruct (diff)
  - include
    - Client.h
  - src
    - client
      - Client.cc
      - SConstruct
    - sched
      - SConstruct (diff)
- um
  - UserPool.cc (diff)