search

ripienaar / gdash

A dashboard for Graphite
http://www.devco.net/
Apache License 2.0
754 stars 117 forks source link

Expanded includes #59

Closed moxie0 closed 11 years ago

moxie0 commented 12 years ago

I added some more include functionality on top of what @keymon provided (which I found extremely useful).

falkenbt commented 11 years ago

Would love to see this merged, it is really useful.

ripienaar commented 11 years ago

Looking quite unlikely I'll get this merged in its current state as code paths have diverged too much and there are big conflicts I do not have time to resolve :(

keymon commented 11 years ago

Actually in my branch I just merged ripienaar's last commits. All this code is merged there.

falkenbt commented 11 years ago

The same goes for my branch (test). But I think merging back into the master would be a good thing regarding further development. Otherwise the diverge will get worse. @ripienaar can you just merge keymons branch?

ripienaar commented 11 years ago

I'll take a look - the one in this PR def does not merge cleanly for me on master

falkenbt commented 11 years ago

Actually...looking at https://github.com/ripienaar/gdash/pull/49 - maybe @keymon could do it himself if he gets the permission. I would be glad to assist or test the result.

falkenbt commented 11 years ago

@moxie0 do you want to merge this?

falkenbt commented 11 years ago

This should be in master with https://github.com/ripienaar/gdash/pull/66