Skip to content

Instantly share code, notes, and snippets.

@aurora
Forked from plu/gist:1688329
Created January 27, 2012 13:12
Show Gist options
  • Save aurora/1688703 to your computer and use it in GitHub Desktop.
Save aurora/1688703 to your computer and use it in GitHub Desktop.
johannes.plunien@localhost /tmp$ git clone https://github.com/aurora/Memcached-Munin-Plugin.git
Cloning into Memcached-Munin-Plugin...
remote: Counting objects: 20, done.
remote: Compressing objects: 100% (17/17), done.
remote: Total 20 (delta 9), reused 7 (delta 3)
Unpacking objects: 100% (20/20), done.
johannes.plunien@localhost /tmp$ cd Memcached-Munin-Plugin/
johannes.plunien@localhost /tmp/Memcached-Munin-Plugin[master]$ git co -b mattdeboard-master
Switched to a new branch 'mattdeboard-master'
johannes.plunien@localhost /tmp/Memcached-Munin-Plugin[mattdeboard-master]$ git pull https://github.com/mattdeboard/Memcached-Munin-Plugin.git
remote: Counting objects: 13, done.
remote: Compressing objects: 100% (11/11), done.
remote: Total 12 (delta 3), reused 10 (delta 1)
Unpacking objects: 100% (12/12), done.
From https://github.com/mattdeboard/Memcached-Munin-Plugin
* branch HEAD -> FETCH_HEAD
Removing README
Merge made by recursive.
README | 96 ------------------------------------------------------------
README.rst | 85 +++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 85 insertions(+), 96 deletions(-)
delete mode 100644 README
create mode 100644 README.rst
johannes.plunien@localhost /tmp/Memcached-Munin-Plugin[mattdeboard-master]$ git co master
Switched to branch 'master'
johannes.plunien@localhost /tmp/Memcached-Munin-Plugin[master]$ git merge mattdeboard-master
Updating c00c9cf..efdf33a
Fast-forward
README | 96 ------------------------------------------------------------
README.rst | 85 +++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 85 insertions(+), 96 deletions(-)
delete mode 100644 README
create mode 100644 README.rst
johannes.plunien@localhost /tmp/Memcached-Munin-Plugin[master]$ git log -n2
commit efdf33a6c010d9310c8b02b5ab80440514202ffc (HEAD, mattdeboard-master, master)
Merge: c00c9cf 6b0efc1
Author: Johannes Plunien <johannes.plunien@xing.com>
Date: Fri Jan 27 12:14:15 2012 +0100
Merge https://github.com/mattdeboard/Memcached-Munin-Plugin into mattdeboard-master
commit c00c9cf1144d3f0e1332caf994a317d71b426960 (origin/master, origin/HEAD)
Author: Harald Lapp <harald.lapp@gmail.com>
Date: Fri Jan 27 02:59:02 2012 +0100
Add a prefix to the graph title allows multi instance monitoring
johannes.plunien@localhost /tmp/Memcached-Munin-Plugin[master]$ git pull --rebase
First, rewinding head to replay your work on top of it...
Applying: Updated documentation to not be wrong.
Applying: Fixed some unescaped underscores.
Applying: Fixed some unescaped underscores.
Applying: More rst markup fixes in documentation.
johannes.plunien@localhost /tmp/Memcached-Munin-Plugin[master]$ git log -n 2
commit a20dc7946a8a25eff2a957c0ec0c46c6158039ce (HEAD, master)
Author: Matt DeBoard <matt.deboard@gmail.com>
Date: Tue Sep 27 15:33:18 2011 -0900
More rst markup fixes in documentation.
commit 934b4700074f06ea43c5ddbe40589226d28c0066
Author: Matt DeBoard <matt.deboard@gmail.com>
Date: Tue Sep 27 15:32:16 2011 -0900
Fixed some unescaped underscores.
johannes.plunien@localhost /tmp/Memcached-Munin-Plugin[master]$ git log -n 10
commit a20dc7946a8a25eff2a957c0ec0c46c6158039ce (HEAD, master)
Author: Matt DeBoard <matt.deboard@gmail.com>
Date: Tue Sep 27 15:33:18 2011 -0900
More rst markup fixes in documentation.
commit 934b4700074f06ea43c5ddbe40589226d28c0066
Author: Matt DeBoard <matt.deboard@gmail.com>
Date: Tue Sep 27 15:32:16 2011 -0900
Fixed some unescaped underscores.
commit 57e9343f7b407abad78119ba4d5cef92cec9c2a1
Author: Matt DeBoard <matt.deboard@gmail.com>
Date: Tue Sep 27 15:31:32 2011 -0900
Fixed some unescaped underscores.
commit 0bc1578070606a1f7059c1fbfa319fbd6c34080f
Author: Matt DeBoard <matt.deboard@gmail.com>
Date: Tue Sep 27 15:29:45 2011 -0900
Updated documentation to not be wrong.
commit c00c9cf1144d3f0e1332caf994a317d71b426960 (origin/master, origin/HEAD)
Author: Harald Lapp <harald.lapp@gmail.com>
Date: Fri Jan 27 02:59:02 2012 +0100
Add a prefix to the graph title allows multi instance monitoring
commit e422977b6c63475d93e0b60ab01d95e62413b3df
Author: Pyry Hakulinen <pyry@automattic.com>
Date: Thu Jun 23 14:11:53 2011 +0300
Add a prefix to the graph title allows multi instance monitoring
Now it's possible to add a prefix to the symbolic link eg:
userdata_memcached_commands
filedetails_memcached_commands
.. etc
You can then specify port/host for each instance in plugin-conf.d
commit 92b29e066f04bda027742af0cf069dd2ce92f932
Author: Matt West <mhwest13@gmail.com>
Date: Mon Apr 11 23:10:47 2011 -0700
Fixed Some Documentation for Subroutines, noticed dupes / typos. Added fix for memcached <1.4.2 not having reclaimed items.
commit 0e9d8599ea28d800c44bc76b4013ebb8fefaddd6
Author: Matt West <mhwest13@gmail.com>
Date: Wed Nov 17 11:55:41 2010 -0800
Added all sorts of perldoc info and comments to code
commit 292cd7c6a1078add0a94f1fd8ac5bfb44df0403f
Author: Matt West <mhwest13@gmail.com>
Date: Mon Nov 15 20:22:22 2010 -0800
Update README
commit 9e21e568835cf01ad3fd0cfcb472373ad1b93a2f
Author: Matt West <mhwest13@gmail.com>
Date: Mon Nov 15 19:01:40 2010 -0800
Initial Import to github
johannes.plunien@localhost /tmp/Memcached-Munin-Plugin[master]$
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment