← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/plugin/scheduler.cc

Merge trunk and resolve all conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/plugin/scheduler.cc
25
25
 
26
26
using namespace std;
27
27
 
28
 
using namespace drizzled;
 
28
namespace drizzled
 
29
{
29
30
 
30
31
vector<plugin::Scheduler *> all_schedulers;
31
32
 
99
100
{
100
101
  return scheduler;
101
102
}
 
103
 
 
104
} /* namespace drizzled */