aboutsummaryrefslogtreecommitdiff
path: root/content
diff options
context:
space:
mode:
authorkballou <kballou@devnulllabs.io>2016-02-24 20:49:13 -0700
committerkballou <kballou@devnulllabs.io>2017-09-02 19:31:45 -0600
commit9faf2797e283cc38bc5a04d17072199ff15cbecf (patch)
tree361d3094472f3f0d5499e5e60ff49ac76e39b973 /content
parentc44a32c7b8e2ece515ef04da479b46fd29edfddf (diff)
downloadblog.kennyballou.com-9faf2797e283cc38bc5a04d17072199ff15cbecf.tar.gz
blog.kennyballou.com-9faf2797e283cc38bc5a04d17072199ff15cbecf.tar.xz
Redesign ALL the Things
* Add target _blank for external social links * Change color scheme to more Solarized * Remove author column - This is moved to the top * Update links to images - These are now using Hugo's shortcodes for "figures"
Diffstat (limited to 'content')
-rw-r--r--content/about-me.markdown4
-rw-r--r--content/blog/Spark.markdown4
-rw-r--r--content/blog/Storm-vs-Spark.markdown6
-rw-r--r--content/blog/Storm.markdown4
-rw-r--r--content/blog/git-in-reverse.markdown38
5 files changed, 16 insertions, 40 deletions
diff --git a/content/about-me.markdown b/content/about-me.markdown
index 81b0172..0ae58f2 100644
--- a/content/about-me.markdown
+++ b/content/about-me.markdown
@@ -1,5 +1,5 @@
---
-title: "about me"
+title: "About Me"
keywords: []
tags: []
pubdate: "2014-10-10"
@@ -9,8 +9,6 @@ topics: []
slug: about-me
---
-# About Me #
-
I am a life-long learner, developer, mathematician, and overall thinker. I
enjoy solving problems and learning about technologies and discussing new and
different ideas.
diff --git a/content/blog/Spark.markdown b/content/blog/Spark.markdown
index cac839b..a8a8262 100644
--- a/content/blog/Spark.markdown
+++ b/content/blog/Spark.markdown
@@ -231,7 +231,7 @@ reporting purposes.
This project follows a very similar process structure as the Storm Topology
from last time.
-![Sentiment Analysis Topology][satimg]
+{{< figure src="/media/SentimentAnalysisTopology.png" >}}
However, each node in the above graph is actually a transformation on the
current DStream and not an individual process (or group of processes).
@@ -596,8 +596,6 @@ Spark and Apache Storm.
## Related Links / References ##
-[satimg]: https://kennyballou.com/media/SentimentAnalysisTopology.png
-
[1]: http://spark.apache.org/
* [Apache Spark][1]
diff --git a/content/blog/Storm-vs-Spark.markdown b/content/blog/Storm-vs-Spark.markdown
index 03fa082..ea9dc7d 100644
--- a/content/blog/Storm-vs-Spark.markdown
+++ b/content/blog/Storm-vs-Spark.markdown
@@ -142,11 +142,13 @@ order of magnitude less.
Spark Open and Closed JIRA Issues (last 30 days):
-[![Spark JIRA Issues][spark_jira_issues]][18]
+{{< figure src="/media/spark_issues_chart.png"
+ link="https://issues.apache.org/jira/browse/SPARK/" >}}
Storm Open and Closed JIRA Issues (last 30 days):
-[![Storm JIRA Issues][storm_jira_issues]][17]
+{{< figure src="/media/storm_issues_chart.png"
+ link="https://issues.apache.org/jira/browse/STORM/" >}}
### Contributor/ Community Size ###
diff --git a/content/blog/Storm.markdown b/content/blog/Storm.markdown
index ee40e82..68bb4e8 100644
--- a/content/blog/Storm.markdown
+++ b/content/blog/Storm.markdown
@@ -107,7 +107,7 @@ High-Availability is baked into this virtual cluster.
### Overview ###
-![Sentiment Analysis Topology][satimg]
+{{< figure src="/media/SentimentAnalysisTopology.png" >}}
I wrote a simple Kafka producer that reads files off disk and sends them to the
Kafka cluster. This is how we feed the whole system and is used in lieu of
@@ -523,8 +523,6 @@ Streaming with Apache Spark.
## Related Links / References ##
-[satimg]: https://kennyballou.com/media/SentimentAnalysisTopology.png
-
[1]: http://storm.incubator.apache.org/
* [Apache Storm Project Page][1]
diff --git a/content/blog/git-in-reverse.markdown b/content/blog/git-in-reverse.markdown
index 7157203..88deb04 100644
--- a/content/blog/git-in-reverse.markdown
+++ b/content/blog/git-in-reverse.markdown
@@ -26,11 +26,7 @@ branching.
## What is Git± ##
-![XKCD on Git](http://imgs.xkcd.com/comics/git.png "If that doesn't fix it,
-git.txt contains the phone number of a friend of mine who understands git. Just
-wait through a few minutes of 'It's really pretty simple, just think of
-branches as...' and eventually you'll learn the commands that will fix
-everything.")
+{{< figure src="http://imgs.xkcd.com/comics/git.png" caption="If that doesn't fix it, git.txt contains the phone number of a friend of mine who understands git. Just wait through a few minutes of 'It's really pretty simple, just think of branches as...' and eventually you'll learn the commands that will fix everything." >}}
Git is a few things to many people, and creating a standard definition is our
first step to fully understanding the nebulous Git.
@@ -179,7 +175,7 @@ filename for `foo.txt`.
Visually, this may look like something similar to the following image:
-![Git Tree 1][git-tree-1]
+{{< figure src="/media/git-tree-1.png" >}}
If we inspect the `.git/objects` directory, we should see a new object:
@@ -205,7 +201,7 @@ filename of the object or folder name if the element is a tree.
A more complicated example of a Git tree may look like the following image:
-![Git Tree 2][git-tree-2]
+{{< figure src="/media/git-tree-2.png" >}}
Now we have file names and the ability to track folders, however, we are still
managing and holding onto the checksums ourselves. Furthermore, we have no
@@ -262,7 +258,7 @@ Finally, after a blank line, the rest of the file is reserved for the commit
message; since "our first commit" message is short, it only takes a single
line.
-![git commit 1][git-commit-1]
+{{< figure src="/media/git-commit-1.png" >}}
To inform Git that we have created a commit, we need to add some information to
a few files. First, we need create the `master` reference. We do this by
@@ -557,7 +553,7 @@ isn't yet made aware, the code has diverged from a single path of existence to
multiple paths. This is a form of implicit branching and explicit branching
isn't much different.
-![Code Branching][code-branching]
+{{< figure src="/media/code-branching.png" >}}
The structure of Git makes branching trivial, in fact, all that's required is
to create a file that marks the branch point of the code. That is, to create a
@@ -565,7 +561,7 @@ file under `.git/refs/heads` that contains the branch's base commit hash. From
there, the code can safely move forward without changing anything of the other
branches.
-![Git Branching][git-branching-1]
+{{< figure src="/media/git-branching-1.png" >}}
Branching in Git is accomplished with [`git-branch(1)`][20] and
[`git-checkout(1)`][21].
@@ -598,9 +594,9 @@ The first Git will try is called "fast-forward" merging, where Git will attempt
to play the source branch's commits against the target branch, from the common
history point forward.
-![Git Fast Forward Merge Initial][git-ff-merge-1]
+{{< figure src="/media/git-ff-merge-1.png" >}}
-![Git Fast Forward Merge Replay][git-ff-merge-2]
+{{< figure src="/media/git-ff-merge-2.png" >}}
However, this can only be accomplished if the target branch doesn't have any
changes of its own.
@@ -612,7 +608,7 @@ and attempt to re-apply the merge, the resolution of the merge will be in the
merge commit. For more information on merging, see the [`git-merge(1)`][22]
documentation.
-![Git Resolve Merge][git-resolve-merge]
+{{< figure src="/media/git-resolve-merge.png" >}}
## Summary ##
@@ -686,19 +682,3 @@ Beyond these problems, Git is a very powerful and capable source control tool.
[22]: https://www.kernel.org/pub/software/scm/git/docs/git-merge.html
[23]: https://kennyballou.com/git-in-reverse.pdf
-
-[code-branching]: https://kennyballou.com/media/code-branching.png
-
-[git-branching-1]: https://kennyballou.com/media/git-branching-1.png
-
-[git-commit-1]: https://kennyballou.com/media/git-commit-1.png
-
-[git-ff-merge-1]: https://kennyballou.com/media/git-ff-merge-1.png
-
-[git-ff-merge-2]: https://kennyballou.com/media/git-ff-merge-2.png
-
-[git-resolve-merge]: https://kennyballou.com/media/git-resolve-merge.png
-
-[git-tree-1]: https://kennyballou.com/media/git-tree-1.png
-
-[git-tree-2]: https://kennyballou.com/media/git-tree-2.png