resolved merge conflict.
This commit is contained in:
commit
ffe0734c12
1 changed files with 3 additions and 1 deletions
|
@ -6,7 +6,9 @@ _Elektron_ is a Mesos framework that behaves as a playground for developers to e
|
|||
However, in addition to being a scheduler, Elektron also takes advantage of tools such as [Performance Co-Pilot](http://pcp.io/) and [RAPL](https://01.org/blogs/2014/running-average-power-limit--rapl) to help contain the power envelope within defined thresholds, reduce peak power consumption, and also reduce total energy consumption. Elektron is able to leverage the Mesos-provided resource abstraction to allow different algorithms to decide how to consume resource offers made by a Mesos Master.
|
||||
|
||||
#Architecture
|
||||

|
||||
|
||||

|
||||
|
||||
|
||||
#Features
|
||||
* [Pluggable Scheduling Policies](docs/SchedulingPolicies.md)
|
||||
|
|
Reference in a new issue