This repository has been archived by the owner on Mar 1, 2020. It is now read-only.
fix merge conflicts
Mongoid 2.x to 3.x * Added cacti_template_id * Added operatingsystem type
try 1 cacti_template_id
added info about operatingsystem
Merge branch 'release/v005' into develop
history file
removed old slim
changed hostlist from slim to erb with some new stuff to add hosts
Merge branch 'feature/fix' into develop
recover changes from prod
recover changes from prod
Merge branch 'feature/cap' into develop
fix gitignore
capfile incompleto
Merge branch 'feature/cacti' into develop
added ssh command
modify some views
Merge branch 'feature/mongo' into develop
cacti start
fix after_perform to update status
fix address and description mismatch
logging and callback to mongo update status
logging fixes
Merge branch 'release/003' into develop
Merge branch 'feature/worker' into develop
worker finished to add hosts
worker 99%
view updated
resque done, queue 90%
Merge branch 'feature/mongo' into develop
finish simple queue
queue almost done
capture request2
capture request
document and url handler
first thoughts on queue
Merge branch 'release/v002' into develop
concluido
stuff out of order
Merge branch 'feature/queue' into develop
headless feature all complete
cleanup
Merge branch 'feature/sinatracontrib' into develop
cleanup
sinatra contrib ok
Merge branch 'release/v001' into develop
concluido
stuff out of order
Merge branch 'feature/queue' into develop
headless feature all complete
cleanup
clean2
Merge branch 'feature/sinatracontrib' into develop
cleanup
sinatra contrib ok
Merge branch 'release/v001' into develop
Core started
Initial commit
You can’t perform that action at this time.