| Data, single: total=640.00GiB, used=628.88GiB | |
| Data, RAID5: total=786.00GiB, used=785.99GiB | |
| System, RAID1: total=64.00MiB, used=196.00KiB | |
| Metadata, RAID1: total=269.00GiB, used=2.29GiB | |
| unknown, single: total=512.00MiB, used=0.00 | |
| Label: 'massive' uuid: b705fef7-a604-4ba1-bc43-bc387e58c733 | |
| Total devices 3 FS bytes used 1.38TiB | |
| devid 1 size 1.77TiB used 1.01TiB path /dev/sdb2 | |
| devid 2 size 875.63GiB used 662.06GiB path /dev/sdc2 |
| <?xml version="1.0" encoding="UTF-8"?> | |
| <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> | |
| <plist version="1.0"> | |
| <dict> | |
| <key>ANSIBlueColor</key> | |
| <data> | |
| YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS | |
| AAGGoKMHCA9VJG51bGzTCQoLDA0OVU5TUkdCXE5TQ29sb3JTcGFjZVYkY2xhc3NKMC4y | |
| IDAuNCAxABABgALSEBESE1okY2xhc3NuYW1lWCRjbGFzc2VzV05TQ29sb3KiEhRYTlNP | |
| YmplY3RfEA9OU0tleWVkQXJjaGl2ZXLRFxhUcm9vdIABCBEaIy0yNztBSE5bYm1vcXaB |
| From 8f073c7661197cefe8fbfaa723b96a522420c672 Mon Sep 17 00:00:00 2001 | |
| From: Kyle Manna <kmanna@fanhattan.com> | |
| Date: Fri, 22 Aug 2014 15:04:20 -0700 | |
| Subject: [PATCH] HACK: wipe: Add timing parameters | |
| * Add timing parameters | |
| Change-Id: If82f1777355e56ccc4ea3c6722d0bf1771e1e630 | |
| --- | |
| ext4_utils/Android.mk | 9 +++++++++ |
| #!/bin/bash | |
| # Search through a AOSP branch for something interesting | |
| set -x | |
| find $HOME/ovation \ | |
| \( \ | |
| -iname Makefile \ | |
| -o -iname \*.xml \ | |
| -o -iname \*.py \ | |
| -o -iname \*.aidl \ | |
| -o -iname \*.mk \ |
##git mergetool
In the middle file (future merged file), you can navigate between conflicts with ]c and [c.
Choose which version you want to keep with :diffget //2 or :diffget //3 (the //2 and //3 are unique identifiers for the target/master copy and the merge/branch copy file names).
:diffupdate (to remove leftover spacing issues)
:only (once you’re done reviewing all conflicts, this shows only the middle/merged file)
| Thought For The Day (A Beautiful Poem) | |
| by Fattire | |
| Puppies playing puppily | |
| Monkeys swinging from a tree, | |
| Fishes swimming in the sea, | |
| Reminding me | |
| Some best things in life... | |
| are free. |
| # Global configuration section: lists input and output devices always present on the device | |
| # as well as the output device selected by default. | |
| # Devices are designated by a string that corresponds to the enum in audio.h | |
| global_configuration { | |
| attached_output_devices AUDIO_DEVICE_OUT_SPEAKER | |
| default_output_device AUDIO_DEVICE_OUT_SPEAKER | |
| attached_input_devices AUDIO_DEVICE_IN_BUILTIN_MIC | |
| } |
| # begin build properties | |
| # autogenerated by buildinfo.sh | |
| ro.build.id=IMM76L | |
| ro.build.display.id=IMM76L | |
| ro.build.version.incremental=1906 | |
| ro.build.version.sdk=15 | |
| ro.build.version.codename=REL | |
| ro.build.version.release=0.20.0.1906 | |
| ro.build.date=Wed Jul 2 00:53:07 UTC 2014 | |
| ro.build.date.utc=1404262387 |
| /dev/input/event6 | |
| bustype : BUS_BLUETOOTH | |
| vendor : 0x1915 | |
| product : 0xeeee | |
| version : 1 | |
| name : "Smart Remote 2" | |
| phys : "00:02:72:33:xx:xx" | |
| uniq : "D7:58:81:3F:xx:xx" | |
| bits ev : EV_SYN EV_KEY EV_REL EV_MSC EV_LED EV_REP |
| #FROM ubuntu:14.04 | |
| #RUN apt-get update && \ | |
| # apt-get install --no-install-recommends -y software-properties-common && \ | |
| # apt-add-repository ppa:ansible/ansible && \ | |
| # apt-get update && \ | |
| # apt-get install -y ansible | |
| FROM ansible/ubuntu14.04-ansible:stable | |
| MAINTAINER Kyle Manna <kmanna@fan.tv> |