From 6b57b8c6eb6837475749c2d762416d7d0cd380f5 Mon Sep 17 00:00:00 2001 From: Eric Chou Date: Mon, 21 Mar 2016 10:15:05 -0700 Subject: [PATCH 1/5] Revert "added features.py and changed macAddress.py" This reverts commit 8e0825f683f901d20b86865e355b5412b6939041. --- features.py | 2 -- macAddress.py | 3 --- 2 files changed, 5 deletions(-) delete mode 100644 features.py diff --git a/features.py b/features.py deleted file mode 100644 index 29e9368..0000000 --- a/features.py +++ /dev/null @@ -1,2 +0,0 @@ -print("Great new feature in development branch") - diff --git a/macAddress.py b/macAddress.py index e297424..4e6f418 100644 --- a/macAddress.py +++ b/macAddress.py @@ -10,9 +10,6 @@ # python macAddress.py -d 192.168.148.163 -p 1 # -# I think we should switch this to requests -# It is HTTP for Humans, after all. - import httplib, json, urllib, urllib2, optparse import socket, ssl from xml.etree import ElementTree From 8d27ab40ce67516a04cc8a352bc20184ae1202bc Mon Sep 17 00:00:00 2001 From: Eric Chou Date: Mon, 21 Mar 2016 10:44:14 -0700 Subject: [PATCH 2/5] added features_v1.py --- features_v1.py | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 features_v1.py diff --git a/features_v1.py b/features_v1.py new file mode 100644 index 0000000..f8c9b96 --- /dev/null +++ b/features_v1.py @@ -0,0 +1,2 @@ +print("This is the new features.py v1") + From 44d13c126a127a7176732f9b3df39f8d1484c65e Mon Sep 17 00:00:00 2001 From: Eric Chou Date: Mon, 21 Mar 2016 10:55:39 -0700 Subject: [PATCH 3/5] added new_feature_v2.py --- new_feature_v2.py | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 new_feature_v2.py diff --git a/new_feature_v2.py b/new_feature_v2.py new file mode 100644 index 0000000..4272573 --- /dev/null +++ b/new_feature_v2.py @@ -0,0 +1,2 @@ +print("new feature v2 in branch my_new_feature") + From 01126fe27ce56319f73884b7ba73dceb1aaf4cc6 Mon Sep 17 00:00:00 2001 From: Eric Chou Date: Mon, 21 Mar 2016 11:16:12 -0700 Subject: [PATCH 4/5] added tag_feature.py --- tag_feature.py | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 tag_feature.py diff --git a/tag_feature.py b/tag_feature.py new file mode 100644 index 0000000..d0980f1 --- /dev/null +++ b/tag_feature.py @@ -0,0 +1,2 @@ +print('this is a new feature file with git tag v1') + From 78a177ae4c8638d58dc873e4b1c589a1d5aaa717 Mon Sep 17 00:00:00 2001 From: Eric Chou Date: Mon, 21 Mar 2016 11:17:30 -0700 Subject: [PATCH 5/5] added tag2_feature.py --- tag2_feature.py | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 tag2_feature.py diff --git a/tag2_feature.py b/tag2_feature.py new file mode 100644 index 0000000..90e8439 --- /dev/null +++ b/tag2_feature.py @@ -0,0 +1,2 @@ +print("tag 2 feature.py") +